From 2a9911724f5ad1f3fa7eb8c7f48e7aaac45185f7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 2 Apr 2020 08:47:02 -0400 Subject: [PATCH] imcontextsimple: Load ~/.Compose unconditionally There is nothing display-specific in the ~/.Compose file, so we can just try to load it without looking at the display we are on. --- gtk/gtkimcontextsimple.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 51229a54dc..1b809a12e5 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -1438,23 +1438,11 @@ gtk_im_context_simple_set_client_widget (GtkIMContext *context, GtkWidget *widget) { GtkIMContextSimple *im_context_simple = GTK_IM_CONTEXT_SIMPLE (context); - gboolean run_compose_table = FALSE; if (!widget) return; - /* Load compose table for X11 or Wayland. */ -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget))) - run_compose_table = TRUE; -#endif -#ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (widget))) - run_compose_table = TRUE; -#endif - - if (run_compose_table) - init_compose_table_async (im_context_simple, NULL, NULL, NULL); + init_compose_table_async (im_context_simple, NULL, NULL, NULL); } /** -- 2.30.2